1e850c9fd0abe0b3185d31fb350f9f7ed027e7da,enterprise/main/java/org/neo4j/kernel/ha/SlaveIdGenerator.java,SlaveIdGenerator,nextId,#,115

Before Change


            if ( nextId == VALUE_REPRESENTING_NULL )
            {
                // If we dont have anymore grabbed ids from master, grab a bunch 
                IdAllocation allocation = broker.getMaster().first().allocateIds( idType );
                nextId = storeLocally( allocation );
            }
            return nextId;

After Change


        try
        {
            long nextId = nextLocalId();
            Pair<Master, Machine> master = broker.getMaster();
            if ( nextId == VALUE_REPRESENTING_NULL )
            {
                // If we dont have anymore grabbed ids from master, grab a bunch
                IdAllocation allocation = master.first().allocateIds( idType );
                allocationMaster = master.other().getMachineId();
                nextId = storeLocally( allocation );
            }
            else